Skip to content

chore: resolve v2.13.1 unified merge artifacts#4104

Merged
NoelStephensUnity merged 1 commit into
develop-3.x.xfrom
chore/resolve-2-13-1-unified-merge-artifacts
Jul 24, 2026
Merged

chore: resolve v2.13.1 unified merge artifacts#4104
NoelStephensUnity merged 1 commit into
develop-3.x.xfrom
chore/resolve-2-13-1-unified-merge-artifacts

Conversation

@NoelStephensUnity

Copy link
Copy Markdown
Member

Purpose of this PR

This just resolves some changes made in develop-2.0.0 that were missed during the merge due to our CI does not currently enable unified tests (this will happen when the unified PR lands in trunk).

Jira ticket

NA

Changelog

NA

Documentation

  • No documentation changes or additions were necessary.

Testing & QA (How your changes can be verified during release Playtest)

Functional Testing

Manual testing :

  • Manual testing done

Automated tests:

  • Covered by existing automated tests
  • Covered by new automated tests

Does the change require QA team to:

  • Review automated tests?
  • Execute manual tests?
  • Provide feedback about the PR?

If any boxes above are checked the QA team will be automatically added as a PR reviewer.

Up-port

No up-port is required.

Backports

No back-port is required.

Resolving changes made to develop-2.0.0 and were missed in merge due to all of that script is defined out and we have not yet enabled the CI unified tests (which would have caught this).
@NoelStephensUnity
NoelStephensUnity requested a review from a team as a code owner July 24, 2026 18:51
@NoelStephensUnity
NoelStephensUnity enabled auto-merge (squash) July 24, 2026 18:53
@NoelStephensUnity
NoelStephensUnity requested a review from EmandM July 24, 2026 19:00
@codecov-github-com

codecov-github-com Bot commented Jul 24, 2026

Copy link
Copy Markdown

Codecov Report

All modified and coverable lines are covered by tests ✅

@@                Coverage Diff                @@
##           develop-3.x.x    #4104      +/-   ##
=================================================
- Coverage          70.44%   70.43%   -0.02%     
=================================================
  Files                146      146              
  Lines              23275    23275              
=================================================
- Hits               16396    16393       -3     
- Misses              6879     6882       +3     
Flag Coverage Δ
NGOv2_ubuntu_6000.3 70.43% <ø> (-0.02%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files with missing lines Coverage Δ
...eobjects/Runtime/SceneManagement/SceneEventData.cs 41.91% <ø> (ø)

... and 1 file with indirect coverage changes

Components Coverage Δ
com.unity.netcode.gameobjects 70.43% <ø> (-0.02%) ⬇️

ℹ️ Need help interpreting these results?

@NoelStephensUnity
NoelStephensUnity merged commit 92d8bb9 into develop-3.x.x Jul 24, 2026
26 checks passed
@NoelStephensUnity
NoelStephensUnity deleted the chore/resolve-2-13-1-unified-merge-artifacts branch July 24, 2026 22:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants